From 7884ec8efbb8a45c228e1e707d6d32bfe417afaa Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladk@debian.org>
Date: Thu, 5 Nov 2020 17:48:18 +0100
Subject: [PATCH] Update debian-files

---
 debian/control              | 3 +--
 debian/python3-vtk9.install | 3 ++-
 debian/rules                | 8 ++++----
 debian/watch                | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index a2fad4b12..1e2291af5 100644
--- a/debian/control
+++ b/debian/control
@@ -158,8 +158,7 @@ Description: VTK libraries
 Package: libvtk9-java
 Architecture: any
 Section: java
-Depends: libvtk9-jni (= ${binary:Version}),
-         ${java:Depends},
+Depends: ${java:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: java-virtual-machine,
diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install
index 2f0cca12a..8caa0e1bd 100644
--- a/debian/python3-vtk9.install
+++ b/debian/python3-vtk9.install
@@ -1 +1,2 @@
-usr/lib/*/python3*/site-packages/* /usr/lib/python3/dist-packages/
+usr/lib/python3
+usr/bin/vtk9python
diff --git a/debian/rules b/debian/rules
index e949fb4f3..cb20e3575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,13 +80,13 @@ override_dh_auto_build-arch:
 override_dh_auto_install:
 	pwd
 	dh_auto_install -X.pyc -X.pyo
-	# Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in	from $VTK_DIR
-	perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/vtkWrapJava.cmake
 	# Correct headers for paraview
 	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
-	mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk9python
+	mv $(CURDIR)/debian/tmp/usr/bin/vtkpython $(CURDIR)/debian/tmp/usr/bin/vtk9python
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/python3
+	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/python3.9/site-packages $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages 
 	sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
-	chrpath -d $(CURDIR)/debian/build/bin/vtk9python
+	chrpath -d $(CURDIR)/debian/tmp/usr/bin/vtk9python
 
 	find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
 	find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f
diff --git a/debian/watch b/debian/watch
index 7adc3c7f7..59c899983 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-https://github.com/Kitware/VTK/tags .*/v?(9\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+https://github.com/Kitware/VTK/tags .*/v?(8\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
2.30.2